misc: cleanup requires inside checks - v1#2938
Closed
jasonish wants to merge 3 commits intoOISF:masterfrom
Closed
Conversation
- Move require expressions in shell check to requires object - Error if an unknown key is provided in a shell check
- Move require expressions in filter check to requires object - Error if an unknown key is provided in a filter check
Member
Author
|
Build against Suricata |
jasonish
commented
Mar 1, 2026
| gt-version: 8.0.4 | ||
| requires: | ||
| lt-version: 8.0.4 | ||
| gt-version: 8.0.4 |
Member
Author
There was a problem hiding this comment.
This looks like an impossible condition, however not new with this PR.
Collaborator
There was a problem hiding this comment.
I think @jufajardini did this for check to run on 7 and on main, but not on 8
Collaborator
There was a problem hiding this comment.
Otherwise check_filter_test_version_compat should be updated to catch more impossible cases
Collaborator
There was a problem hiding this comment.
Oh, but now the code did not check the gt-version at the root because it missed
@@ -551,12 +554,15 @@ class FilterCheck:
req_version = self.config.get("version")
min_version = self.config.get("min-version")
lt_version = self.config.get("lt-version")
+ gt_version = self.config.get("gt-version")
if req_version is not None:
requires["version"] = req_version
if min_version is not None:
requires["min-version"] = min_version
if lt_version is not None:
requires["lt-version"] = lt_version
+ if gt_version is not None:
+ requires["gt-version"] = gt_version
check_filter_test_version_compat(requires, self.test_version)
feature = self.config.get("feature")
if feature is not None:
Member
Author
There was a problem hiding this comment.
Oh, but now the code did not check the gt-version at the root because it missed
@@ -551,12 +554,15 @@ class FilterCheck: req_version = self.config.get("version") min_version = self.config.get("min-version") lt_version = self.config.get("lt-version") + gt_version = self.config.get("gt-version") if req_version is not None: requires["version"] = req_version if min_version is not None: requires["min-version"] = min_version if lt_version is not None: requires["lt-version"] = lt_version + if gt_version is not None: + requires["gt-version"] = gt_version check_filter_test_version_compat(requires, self.test_version) feature = self.config.get("feature") if feature is not None:
Does this PR need a fix?
Collaborator
There was a problem hiding this comment.
I think your PR is good and I see further improvements
catenacyber
reviewed
Mar 2, 2026
catenacyber
approved these changes
Mar 2, 2026
Collaborator
catenacyber
left a comment
catenacyber
left a comment
There was a problem hiding this comment.
I love this
We should even further and add some code like
diff --git a/run.py b/run.py
index ad8f3057..ffb11d51 100755
--- a/run.py
+++ b/run.py
@@ -339,6 +339,9 @@ def check_requires(requires, suricata_config: SuricataConfig, test_dir=None):
raise UnsatisfiedRequirementError(
"requires at least version {}".format(min_version))
elif key == "lt-version":
+ if "gt-version" in requires:
+ raise UnnecessaryRequirementError(
+ "test has both lt-version {} and gt-version {}".format(requires["lt-version"], requires["gt-version"]))
lt_version = requires["lt-version"]
if not is_version_compatible(version=lt_version,
suri_version=suri_version, expr="lt"):
Member
Author
Follwup pr perhaps. Seems to be a separate concern. |
Merged
Member
|
Merged in #2949, thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Filters that prevent a check from running should be inside a requires block as
this is what is documented in the README.